bitkeeper revision 1.1456.1.1 (428c6495K-Bk3cP5wcdHyT5L6-GVxQ)

event.py, XendMigrate.py, EventServer.py:
  Use scheduler.{now,later} instead of reactor.callLater.
reactor.py:
  Remove reactor.callLater function -- same as scheduler.{now,later}.
EventServer.py:
  Cleanup.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/tools/python/xen/web/reactor.py b/tools/python/xen/web/reactor.py
index aa8e0c06465109e46ba6aaa3946f9e49331cfc58..1ebb5c84a0b20bf73e04ed2d128acec257315112 100644 (file)
--- a/tools/python/xen/web/reactor.py
+++ b/tools/python/xen/web/reactor.py
@@ -1,9 +1,2 @@
-from threading import Timer
-
 from unix import listenUNIX, connectUNIX
 from tcp import listenTCP, connectTCP
-
-def callLater(_delay, _fn, *args, **kwds):
-    timer = Timer(_delay, _fn, args=args, kwargs=kwds)
-    timer.start()
-    return timer

diff --git a/tools/python/xen/xend/EventServer.py b/tools/python/xen/xend/EventServer.py
index d9124570dd84d2ee1d522bef92f1d0406b680355..ad0128aa06d156f17575cb35b869fcf202fbce13 100644 (file)
--- a/tools/python/xen/xend/EventServer.py
+++ b/tools/python/xen/xend/EventServer.py
@@ -5,8 +5,7 @@
 import string
 from threading import Lock
 
-#from twisted.internet import reactor
-from xen.web import reactor
+import scheduler
 
 # subscribe a.b.c h: map a.b.c -> h
 # subscribe a.b.* h: map a.b.* -> h
@@ -130,7 +129,7 @@ class EventServer:
             self.lock.release()
             
         if async:
-            reactor.callLater(0, self.call_handlers, event, val)
+            scheduler.now(self.call_handlers, [event, val])
         else:
             self.call_handlers(event, val)
 

diff --git a/tools/python/xen/xend/XendMigrate.py b/tools/python/xen/xend/XendMigrate.py
index e087475b9d1b92b8ae4edcca13cbeb3ddad91d34..5264d68f5af59e9b8c21ff51904b1d8c5809b76e 100644 (file)
--- a/tools/python/xen/xend/XendMigrate.py
+++ b/tools/python/xen/xend/XendMigrate.py
@@ -12,6 +12,7 @@ import types
 from xen.web import reactor
 from xen.web.protocol import Protocol, ClientFactory
 
+import scheduler
 import sxp
 import XendDB
 import EventServer; eserver = EventServer.instance()
@@ -120,7 +121,7 @@ class SuspendHandler:
 
     def start(self):
         self.subscribe(on=True)
-        timer = reactor.callLater(self.timeout, self.onTimeout)
+        timer = scheduler.later(self.timeout, self.onTimeout)
         try:
             self.readyCond.acquire()
             while not self.ready:

diff --git a/tools/python/xen/xend/server/event.py b/tools/python/xen/xend/server/event.py
index e0096d2d95987b1146aa8b93dac184796b451fd4..f16c786c3ef51e1969b5591367d12e23731bf50a 100644 (file)
--- a/tools/python/xen/xend/server/event.py
+++ b/tools/python/xen/xend/server/event.py
@@ -3,6 +3,7 @@ import StringIO
 
 from xen.web import reactor, protocol
 
+from xen.xend import scheduler
 from xen.xend import sxp
 from xen.xend import PrettyPrint
 from xen.xend import EventServer; eserver = EventServer.instance()
@@ -47,7 +48,7 @@ class EventProtocol(protocol.Protocol):
         if self.transport:
             self.transport.loseConnection()
         if self.connected:
-            reactor.callLater(0, self.connectionLost)
+            scheduler.now(self.connectionLost)
 
     def connectionLost(self, reason=None):
         self.unsubscribe()